Merge pull request #1216 from valentinewallace/2021-12-preimage-getter