Resolves #25146

Comment From: sbrannen

This has been merged into 5.2.x and master and backported to 5.1.x.

Thanks