Initial public commit based on version 3.98-2