Upgraded github with platform changes

Need to revisit for merging from parent branch (Jlynch)