ITS#8117 cleanup prev commit