Merge "Fixed issue where layers were not always used" into sc-dev