merge from edrinkercope