(ITS#5787) few improvements