Merge Window to Master

There were significant changes to master so I merged them prior to doing a review.