Merging for 0.4