Fixed groupping settings.
Merge branch 'fix/shippingsetting'