SANDBOX-483 Add changes and fix old Javadocs from [lang] that remained after the code porting