Merge "Provide filter name in user messages"