SamsBranch3: Restored some changed files back to updated master.