AG-4388: jdoc + logging