NCBO-649 remove pipeline in flush
Merge branch 'staging'