Merge 1 7 4 pre into master