Merged in new changes from main repo

More merged in changes.