Merging 1072 fix in from trunk