Draft: Journal view fix

Closed Uriel Mayo requested to merge journalViewFix into 15.0-stage