merged from trunk rev9