Merge "Rename non-Dream-specific precondition and filter." into main