Merge branch 'nd/checkout-m'