timob-12787: addressed comments