Adds control_app support
Staging puma config [ci skip]
Merge branch 'master' into production