Create bugfix6
Merge remote-tracking branch 'origin/RELEASE_1'