changes merged from rasii