Created by: jvanbaarsen
Original PR is from @bbodenmiller -> #7818. He did not respond on rebase request, so I add it in. Commit is still on his name.
@dblessing Can you review?
