Merged from indev