bb-1413, bb-1207 #resolve
Merge pull request #732 from gannetson/project-manage-text-fixes

bb-1413, bb-1207 #resolve