@matzew @sebastienblanc  So let's leave this as is for now then.
I think I've taken care of all the issues you guys have reported. Let me know if I'm good to merge. Thanks!