Closes gh-18261

Comment From: wilkinsona

Thanks very much, @aclement. The proposed changes have been merged into master.