bugfix 10883
[[ Bugfix 10883 ]] Reset group header change
Merge branch 'bugfix-10883' into release-6.1.1