Removing bad merge modif
Fixing some build errors
Fixing some build errors
Merge branch '2.3' into 2.4
fixing typo