GDA-6009 changes to startup scripts