small polishes
Merge remote-tracking branch 'origin/master' into gate
fix overlap detection