reapply change since we rebased from master, where it was not fixed
reapply change since we rebased from master, where it was not fixed

quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive