Merge "Let's enhance" into jb-mr1-dev