Merging more windows changes