Merge svn changes for issues #11728 and #11729. refs #11728, refs #11729