Simplify data import counterparties
Merge branch 'develop'