GDA-6009 Config changes