Merged Maxime Garceau-Brodeur (TM) change into 2.3.2