Resolve legacy merge conflict
Update to 0.3.428