merge: cherry pick from develop #2965

Job	Run time
core-blockchain (16.x)	4m 5s
core-api (16.x)	4m 21s
core-cli (16.x)	5m 20s
core (16.x)	6m 2s
core-database (16.x)	3m 43s
core-forger (16.x)	3m 52s
core-kernel (16.x)	4m 13s
core-logger-pino (16.x)	3m 47s
core-magistrate-api (16.x)	3m 37s
core-magistrate-crypto (16.x)	3m 57s
core-magistrate-transactions (16.x)	3m 56s
core-p2p (16.x)	5m 35s
core-snapshots (16.x)	4m 29s
core-state (16.x)	4m 1s
core-transaction-pool (16.x)	4m 17s
core-test-framework (16.x)	4m 1s
core-transactions (16.x)	4m 22s
core-webhooks (16.x)	3m 58s
crypto (16.x)	4m 31s
	1h 22m 7s

Provide feedback