merged from vadim