Cleaned up some comments to make diff easier for ingy to read during pull request.
Merge branch 'CleanUpCommentsFix' into dev
Removed some spaces.
Merge branch 'CleanUpCommentsFix' into dev
Merge branch 'dev'