Merge "NAS Allowed Adjustments Migration" into sc-dev