Gh 1274

Tested locally - ready for merge.