Fix/2.3.4 Support 2.3.X

Alexandre Morin requested to merge fix/2.3.4 into Support/2.3.X Nov 28, 2018