Merge from feature branch

Code Review <br/>- [ ] @importantguy - [ ] @supercritical