Created by: chrismwendt
This PR does not need to update the CHANGELOG because there are no user-facing changes.