Merge "Removed references to unreleased API from javadocs" into main