Add rule 2.17
Merge branch 'version-4'