Merge branch 'fixes-merge-window-pt2' into fixes