Merge 1.6.0