Merge changes to release 1.8