refs #1702 : merge bugfixes.