Merge "Fix docs build." into jb-mr2-dev