Merge branch 'bs/maint-t7005' into maint