[DF-517] Refactoring for different OS