sync to allow-global-tags branch