support for upstream changes