big-spring-14945
This PR solves an issue we're having as well. Any chance this will make the next release?