Merge pull request #15761 from neheb/gst123