Original request is from: #4890 (comment)

We need to make sure we document this use case with an integration test. Use the example that was given in the comment.

Also adds tests for #5024