Merge for 0.5