fixed duplicate team commitments issues
Merge branch 'dev' into dev-combinedcommitment