Bug 11401 - Search in NL - Interim checkin