Adopted changes from last merge;