Fixed journal loading.
Merge branch 'master' into expression-tab
Loading dev.