bugfix-r6 fixed
Merge branch 'bugfix-r6' into develop