timob-14662: address comments