@XWB Merged, can you rebase and simplify this? Thanks! After that I guess it's read for merge =)