Merge branch 'ef/checkout-empty' into maint