[DF-740] and [DF-769] are implemented - MacOS.