Merge "docs: Fixing broken Javadoc comments" into rvc-dev