Merge commit '5e95c548864bc8b075b8343e69a69e1a22c92456' into 3.2-trivial