merge from doorlog