Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev