Merge branch 'sb/t5614-modernize' into maint