Merge 1.6.1