incentive bug
Merge branch 'hotfix/incentive'