bug 1

bug 2

bug 3
Merge branch 'release/next6' into develop