bug 1

bug 2
Merge branch 'release/next5'
Merge branch 'master' into develop