New tag for pinserver with related fixes.

From #4289.