Hello Ludovic and Nils,

I applied all your suggestions and pushed as
c54511fde0b74bb53c144a84641e3b78ee629dd2

Thanks,
Oleg.