Merge pull request #4844 from oofnikj/4510_backport_gre