Merge for 0.4