Sync code and bump version to 1.6.0