Philip's pull request
https://github.com/aptivate/econsensus/pull/117 plus some minor changes.
https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1544325