merged from RC2-2