Merge from feature branch

Code Review - [ ] @achura - [ ] @aheuermann - [ ] @andymoon - [ ] @bbuckley123 - [ ] @doug-martin - [ ] @dustinsmith1024 - [ ] @jgchristopher - [ ] @jkc - [ ] @russelldc - [ ] @ruzz311 - [ ] @TechnotronicOz - [ ] @thetaiter - [ ] @tim-kretschmer-c2fo