Gh 1348

Remake of PR #1348