Finished backport of downstream updates