Merge in 0.4 final