Module: Tag Manager.
Merge commit 'ed1bcd4d26dde5cdfae5d5828984cca880430723'