[development] tagadelic 'backport' for 4.7