merge windows-configuration to linux branch