Moved latest windows changes to Linux