Modify staging code for Flexpath to avoid bug
Merge branch 'master' into HPCA