Merge "Fix windows specific behavior of FileMap" into lmp-dev