Merge with latest version of code base

Merge with latest version of code base