manually merged Canadian version of 3.9.1