Merge branch 'release/next6' into develop
bug new
Merge branch 'release/next7'