Merge branch 'nd/t1509-chroot-test' into maint