Merge "attempt to fix IMSFramework crash"