Merge "Quick compiler: fix DCHECK"