merged from fix_alias branch, all tests pass