Merging small bug fixes into knowledgebase