I put together a PR here: <https://github.com/micronaut-projects/micronaut-core/pull/1972>
d