Merge "Remove NAS adjustments related settings" into sc-dev