Merge pull request #12633 from seamuslee001/symfony_upgrade