Added by Christos KK Loverdos almost 10 years ago
Merge branch 'issue_4093' into hotfix-0.14.1
Refs #4093