Merge pull request #15590 from flyn-org/gstreamer