Fix buffer status error
Merge branch 'buffer-fix' into async-flowctl

Conflicts:
	mainLoop.c