re-implement https://github.com/popuparchive/pop-up-archive/pull/515/files
re-implement https://github.com/popuparchive/pop-up-archive/pull/515/files

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