Updating to latest Sufia with fixes, refs #9378 #9312