Issue link: https://techleaders.uberflip.com/i/789183
Deploy and fixes while minimizing downtime and user disruption
