Merge from koush