Upstreaming - how to deal with vendor fork