Merge "TIF: fix javadoc of recorded programs" into oc-dev