Merge branch 'ea/checkout-progress'