Add ERC configuration.
Merge remote-tracking branch 'origin/add_erc'