fix to-do-rule-4
Merge remote-tracking branch 'rodsol/r2l' into r2l_rule