Fixes #7503. isReserved doesn't affect adding tags.
Merge branch 'dev' into test