Aloha Nicolas,

The attached patch is based on current maint branch.

Let me know if you have questions.

All the best,
Tom