Porders implementing.
Merge branch 'master' into fetch_contracts_porders