Added changes from stash 1.