Merge branch 'ah/usage-strings'