Merge branch 'kmohrf/flow-control' into 'master'

Allow API store consumers to use traditional flow-control

See merge request !10
2 jobs for master in 6 minutes and 31 seconds (queued for 5 seconds)