merged from original repository