merge from lynchlee