patches
Merge branch 'release/1.6'
releat 1.6