v3.3.2
aa441fb1 · Merge branch 'cherry-pick-93f9bffe' into 'stable-3.3' ·