Imported from Jira [BEAM-3656](https://issues.apache.org/jira/browse/BEAM-3656). Original Jira may contain additional context. Reported by: kenn. Subtask of issue #18687
