Merge "[RESTRICT AUTOMERGE] Attempt to fix exception in IMS" into sc-v2-dev