Merge branch 'rt/help-strings-fix'