merge static credentials file locator from windows branch