Updated from the master repo

Merged changes from the base repo,