In windows mode, do not display empty prefill
Merge branch 'public' into pypy