Merge "Code to Interface: CmHandleQueries"