Merge "Quick compiler: fix DCHECK" into lmp-dev