Merge pull request #13389 from lockiechen/flow_issue_fix