Merge branch 'en/t5407-rebase-m-fix'