This is a continuation of PR #24153.

Comment From: sbrannen

This has been merged into 5.2.x and master.

Thanks