Apply pertag patch
Merge branch 'pertag'