Simon Morlat
2024-02-14T17:04:38Z

Fixes from 5.3 branch.