Merge branch 'sb/t3600-rephrase' into maint