Issue 19453: Added includeNull to allow expired search