drop email (closes #16857)
merge heads
merge 3.2
merge 3.3