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