[LiskHQ/lisk] Mainnet version of #2338 (#2340)

(tagging #2338 to link them)