I hope it's not too late to merge. :)