Cherry-picked the commit 8244f72 to the develop branch (refs #2412, refs #2444).