3.2 i3911 (closes #3911, closes #3912)