merged with windows changes in Linux