Merge remote-tracking branch 'origin/fix-false-comb-loop' into HEAD