Merge "Folder polish" into sc-dev