Merge branch 'ma/t1400-undebug-test' into maint