Updates src from the 3.0.0-wip branch
Update src