fix unit test
done read flow
Merge branch 'master' into journal