Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev