[DF-3542] - File Locking, MacOS changes.