Updated source Vapor changes and fixed conflicts

Supplementary commit. Removed diff identifier.