Did you already have this merged? If not, I'll send separate PR.