Initial commit for the VESPERSDbUpgrade1.6.
Fixed merge conflict.