Gh 1418

#1418 - ready for merge.