timob-11653: address comments