Merge "Add B&R tests for NAS (disabled)" into main