Backport

I'm wishing to merge your changes in my fork till it's merged in official repo