This seems like an issue that's there from before and will likely need a more complex fix, so, we'll do this post-release. cc @davixcky @daniel-de-vera