Implement the pull request https://github.com/jpmorganchase/quorum/commit/87d7c906e9eba93b618651ab5a427746506e2f30 and https://github.com/jpmorganchase/quorum/commit/8bc31e19683a03b5ffacc884f3c16055e911ae26
