Merge pull request #5303 from vgaetera/fix-route6-source