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