Hello Yoann,
Thanks for checking.

The fix for wrynose has already been merged, so wrynose should be covered now.
Could you please review this patch series for scarthgap? This one is intended for the scarthgap branch.
Please let me know if you still see any gap on wrynose.

Thanks,
Anil Dongare