Gh 1253

tested locally - ready for merge.