Merge for 0.4.2 release