What's this PR do/fix? Are there unit tests? If not how should this be manually tested? Any background context you want to provide? What are the relevant issues?