Change code to core 3.2.5 (closes #3428)