Merge from feature branch

Code Review - [ ] @importantguy - [ ] @supercritical