Merge "NAS Feedback UI" into sc-dev