Initial checkin of 2.1.18-1