Merge "add filter delay hint"