Thank you for working on this.
Committed f064aec and pushed on 9.1.x.