Merge branch 'nd/checkout-noisy'