Synchronize the InsertTags class with the upstream changes