Backport changes from anoher repo