Merge 1.6.0 changes back to patch.