Merge branch 'ah/usage-strings' into maint