bonus counting takes into account the partner's status
Merge remote-tracking branch 'origin/master'