Merge branch 'en/checkout-mismerge-fix'