merge from wendycan repo