Merge branch 'me/t5582-cleanup' into maint