Merge "Folder updates." into sc-dev