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