refs #7252. Further fix memory issues.