FW: Final recents commits - WIP
Merge remote-tracking branch 'rootbox/jb-mr1' into jb-mr1