Merge remote-tracking branch 'origin/v3.3.0' into jennifer/monitoring