Merge "Allow releaseBuffer after flush" into klp-dev