merged from other repos