Note changes from upstream