Apply PRs to 3.3.x branches:


Apply PRs to 4.0.0.Beta2x branches:


Thanks,
Michelle