Merge "Orphaned modules are removed from the DB before cmhandle removal"