Merge from feature branch

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