bugfix on customer data
Merge branch 'hotfix/2.0.1'