backport: Merge branch 'journal_patches'

Journal patches

See merge request !321