Fix reading empty layout on Windows
Merge branch 'master' into migration