Improve custom tag performance
Merge branch 'master' into develop