GDA-6009 add CQuery for config standadization feature branches