Merge branch 'tg/checkout-no-overlay'