Merge "Emergency workaround to patch over ID shuffling." into sc-dev