D-14108 Fixed it

Had an issue with work on my other branch, so I'm resubmitting a pull request from this branch.