Merge "Change settings to allow deployment under load" into casablanca