[DF-1038] is fixed - MacOS/Win32.