Merge branch 'jc/t1512-fix' into maint