Gh 1255

this one is ready for merge.