1.8.1 changes

merging changes for 1.8.1