updating for upstream changes/merges