Merging 1.7.1