check rule 20 before save
Merge branch 'zit3287' into dev