Merge pull request #270 from input-output-hk/amesgen/releng-8.5

Merge pull request #270 from input-output-hk/amesgen/releng-8.5 #45