Fix build
Merge remote-tracking branch 'awa/jb-mr1' into jb-mr1