GDA-6009 further changes to startup scripts