[#3188] Fixing a bad merge at sha: ba770f2eb8d42ce525b9c85bf25356cd4b4994db
Merge branch '2.2' into 2.3