Merge trunk up to r9690