Merge "Implement #8323587, #8323342, #8323590: new features." into jb-mr2-dev