Merge "docs: resolve bugs from external tracker" into jb-mr1-dev