Merge branch 'ma/t7005-bash-workaround' into maint