Sync'ed with Master

Sync'ed with Master branch.