Merge with master branch
Set up delayed job for production