Merge branch 'fflush_mgmt' into curls