Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1