Merge "New hooks ApiMain::moduleManager and ApiQuery::moduleManager"