Merge "Implement new IMS system APIs"