Merged in more changes from main repo

Added most recent updates from main repo.