TFS 13179 - further refactoring to resolve resizing issues
Merge branch 'master' of https://github.com/hobarthouse/rshchorus