Merge "Fix: CM Handles for only hasAllModules Query"