Merge "dx: workaround a verifier bug"