Merge branch 'jk/p5302-avoid-collision-check-cost'