timob-12139: add comments