Merge changes (v1.6.0)