Merge "docs: add fs to rs" into jb-mr1-dev