Merge "Quick compiler: fix DCHECKS"