timob-12176: address comments