Merging changes for version 1.8