Merged, let me know if there is anything wrong.

Cheers!

-- 
Pierre Neidhardt
https://ambrevar.xyz/