Merge "Improvements REST documentation generation"