autom. merge with upstream