Merged branch stable/0.83