Merging changes for 0.52