DF-5129 fix build on mac os x after merge with development