refs #852
Merge pull request #1053 from Fank/Feature/852

refs #852