Fix unicorn zero downtime issue
Merge conflicts