Merged from Dani