Merging 0.9 candidate branch changes into master