Merge pull request #1501 from input-output-hk/release/be/0.30.x

Merge pull request #1501 from input-output-hk/release/be/0.30.x #5614