IDEA-107205 (javadoc updated)