upstream changes applied