Merge branch 'dk/maint-t5150-dirname' into maint