if you’d like, I could land #316 as-is and then apply an extraction of #399 on top of that before cutting a release.