Merge pull request #777 from github/lcartey/rule-2-5-alt-uses

Merge pull request #777 from github/lcartey/rule-2-5-alt-uses #3106