Merge branch 'ag/p3400-force-checkout'