merged from trunk rev16