stashed/upstream changes