EDOC-1122
 Merge error when was migrated to 3.7