merged in changes from main repo

merged in changes from main repo