Created by: stephaniepurvis
Applies the change from pull request #18943 to v4. Fixes #18928 (closed).