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

Fix
Signed-off-by: Paul Beeler <sparksco@gmail.com>