Merge commit 'e189aaba93ca28156eb16bb4c2e548ea37a573ad' into flow-manager-title
Merge branch 'flow-manager-query' into flow-manager-title
add test coverage to user_flow_controller