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

* commit 'f06396dae8ad9f6ac2ca2a6afb459f0e106cd786':
  Fix issue #8656537: API review: styles, assist