Allow storing all tags
(cherry picked from commit 2f39c1f7ffcfbd37f27001b6a9f802026c2963b5)