Peacock-2 update (refs #3920)