Jeff/fix 9424

This is for #9424 but the branch was based on the branch that fixes #9418 so that diff will go away once #9419 has been merged into release.