Update to newer version of source project
Merge my changes with source project updates.