case 3475 - Narrow the selection rule.
Merge branch 'case-3475' into develop