Merge "Fix flush() followed by start()" into klp-dev