Merge branch 'fc/disable-checkwinsize'