Merged latest updates from DBC Repo, resolved conflicts.