Add S4 family support (1/3)
Merge remote-tracking branch 'rootbox/jb-mr1' into jb-mr1