Merge pull request #1076 from ProjectSWGCore/master

Commit Group 3 - Merge to Test Center
Merge pull request #1081 from ProjectSWGCore/master

Commit Group 4 - Merge to Test Center