Merge "BUG-1460: make sure DCL works"