Finished merging 0.95.2