Merge "Various tidy ups / refactoring" into sc-dev