Merge "BUG-2402: add FIXMEs and javadoc"