merged from stash