IssueID #10322 add COUNTER patch