changed flow to always invoke
Merge branch 'AGCORDOVA-26_rebased'