Added changes from main repo

Added changes from main repo