Cherry-pick changes in PR #2044 for release 0.77.3 for chaosnet

Heimdallrequested to merge
1203-issue-chaosnet into chaosnet-multichain

Related to #1203 (closed)

Edited by Heimdall

Merge request reports