Readying 1.9
Merged from dev