Merge "Config and corrections for auto deploy"