Backport changes from other project