Initial commit to update production-ready state
Merge branch 'development' into staging