Merge "Ignore generated journal directory"