This patch for ID-886 task