Merge "Add filter for NoPreloadHolders"