diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/asset-proxy/compiler.json
+++ b/contracts/asset-proxy/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/asset-proxy/truffle-config.js b/contracts/asset-proxy/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/asset-proxy/truffle-config.js
+++ b/contracts/asset-proxy/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json
index 4a8f61a09f..700f431289 100644
--- a/contracts/coordinator/compiler.json
+++ b/contracts/coordinator/compiler.json
@@ -3,7 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/coordinator/truffle-config.js b/contracts/coordinator/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/coordinator/truffle-config.js
+++ b/contracts/coordinator/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/dev-utils/compiler.json b/contracts/dev-utils/compiler.json
index 3dac040e77..d473413e33 100644
--- a/contracts/dev-utils/compiler.json
+++ b/contracts/dev-utils/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 200,
diff --git a/contracts/dev-utils/truffle-config.js b/contracts/dev-utils/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/dev-utils/truffle-config.js
+++ b/contracts/dev-utils/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/erc1155/compiler.json
+++ b/contracts/erc1155/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/erc1155/truffle-config.js b/contracts/erc1155/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/erc1155/truffle-config.js
+++ b/contracts/erc1155/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/erc20-bridge-sampler/compiler.json b/contracts/erc20-bridge-sampler/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/erc20-bridge-sampler/compiler.json
+++ b/contracts/erc20-bridge-sampler/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/erc20-bridge-sampler/truffle-config.js b/contracts/erc20-bridge-sampler/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/erc20-bridge-sampler/truffle-config.js
+++ b/contracts/erc20-bridge-sampler/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json
index e65c0e7194..7d150eaa46 100644
--- a/contracts/erc20/compiler.json
+++ b/contracts/erc20/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/erc721/compiler.json
+++ b/contracts/erc721/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/erc721/truffle-config.js b/contracts/erc721/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/erc721/truffle-config.js
+++ b/contracts/erc721/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/exchange-forwarder/compiler.json
+++ b/contracts/exchange-forwarder/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/exchange-forwarder/truffle-config.js b/contracts/exchange-forwarder/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/exchange-forwarder/truffle-config.js
+++ b/contracts/exchange-forwarder/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/exchange-libs/compiler.json
+++ b/contracts/exchange-libs/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/exchange-libs/truffle-config.js b/contracts/exchange-libs/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/exchange-libs/truffle-config.js
+++ b/contracts/exchange-libs/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/exchange/compiler.json
+++ b/contracts/exchange/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/exchange/truffle-config.js b/contracts/exchange/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/exchange/truffle-config.js
+++ b/contracts/exchange/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/extensions/compiler.json
+++ b/contracts/extensions/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/extensions/truffle-config.js b/contracts/extensions/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/extensions/truffle-config.js
+++ b/contracts/extensions/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/integrations/compiler.json b/contracts/integrations/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/integrations/compiler.json
+++ b/contracts/integrations/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/multisig/compiler.json
+++ b/contracts/multisig/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/multisig/contracts/test/TestRejectEther.sol b/contracts/multisig/contracts/test/TestRejectEther.sol
index e3179fcdff..7df961c20d 100644
--- a/contracts/multisig/contracts/test/TestRejectEther.sol
+++ b/contracts/multisig/contracts/test/TestRejectEther.sol
@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity 0.4.24;
+pragma solidity ^0.5.9;
 
 
 // solhint-disable no-empty-blocks
diff --git a/contracts/multisig/truffle-config.js b/contracts/multisig/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/multisig/truffle-config.js
+++ b/contracts/multisig/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/staking/compiler.json b/contracts/staking/compiler.json
index 86353989a3..f66848360b 100644
--- a/contracts/staking/compiler.json
+++ b/contracts/staking/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": true,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/staking/truffle-config.js b/contracts/staking/truffle-config.js
index a5eb0c0dd7..4942f2446e 100644
--- a/contracts/staking/truffle-config.js
+++ b/contracts/staking/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.11',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,
diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json
index 6d739870f0..2984f7fd9f 100644
--- a/contracts/utils/compiler.json
+++ b/contracts/utils/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": false,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "constantinople",
+        "evmVersion": "istanbul",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
diff --git a/contracts/utils/truffle-config.js b/contracts/utils/truffle-config.js
index 2bcbbed1e2..8c95491cdc 100644
--- a/contracts/utils/truffle-config.js
+++ b/contracts/utils/truffle-config.js
@@ -84,7 +84,7 @@ module.exports = {
         solc: {
             version: '0.5.9',
             settings: {
-                evmVersion: 'constantinople',
+                evmVersion: 'istanbul',
                 optimizer: {
                     enabled: true,
                     runs: 1000000,