You should try deploying this branch to staging to make sure we don't have issues on AWS instances.