This upgrade should fix #21311, and @mostlikelee not sure if there's an issue for the Puppet fix you submitted recently.
team_identifier