Backport of 9c19aff7c7561e3a82978a272ecdaad40dda5c00 from main.
Thanks to Andriy Sokolovskiy for initial patch.