timob-12125: comments addressed