Merge "Make changes to upload code resulting from testing" into sc-dev