Merge "[NS04.7] Reinstate a necessary change" into sc-dev