Merged on master; leaving it open for the time being, waiting for your merge into 5.3 as per your comment on the PR, Guillaume Smet.