General code cleanup
Lockout deployment requirements
Merge remote-tracking branch 'github.com/bigmassa/develop'