Created by: dadlerj
This PR does not need to update the CHANGELOG because it has no user-facing impact