FS-21 FS-22 changed some javadoc