Merge "add note to FilterDelayHint"