AK5 to AK4 migration with new Global Tags

Merge of #5588 and #5662