Merge for v1.6 release