Merge "[RESTRICT AUTOMERGE] Attempt to fix exception in IMS"