RE: https://nfcore.slack.com/archives/CE6P95170/p1791365042101449 patch PRs incoming. feel free to merge them on your own, otherwise we will go through and merge them