Gh 1124

ready for merge