Add or setting to approval flow
Merge branch 'kanety-approval'