prepare for jbdoc merge