Add S4 family support (3/3)
Upload to right folder
Include jfltexx in build
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1