Fixes #20930

Comment From: philwebb

Thanks very much for your contribution @encircled. This has now been merged into 2.3.x and master.