Backport of 1c2c6f1b51a540bddc7ae95f4d1213688411ca44 from master
Thanks to Nick Pope and Mariusz Felisiak for review. Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>