Compatible with 0.8.6
Merged from dev