Closes gh-19626

Comment From: mbhave

Thanks @bono007. This has now been merged into master.