Merge pull request #5958 in master
Upgrading branch aliases for components: 2.2-dev -> 2.3-dev, 2.3-dev -> 2.4-dev
Merge pull request #5964
Merge pull request #5964 in develop