timob-11604: address comments