Forward port features from sm-jb-mr1 branch
Signed-off-by: Paul Beeler <sparksco@gmail.com>