Merge branch 'ProjectSWGCore-master'