[DF-1545] - Align functionality, MacOS X.
[DF-1545] - Align functionality, Win32.