Merge commit '2fbcefa' into v3.3.x
Merge commit '7ccdddf' into v3.3.x