[DF-1545] - Align functionality, Win32.