Gh 1322

should be ready to merge.