Does this relate to the tagging change? Should it be a separate PR?