timob-13628: addressed comments