Updated Journal.
Updated Journal.
FIx
Merge origin/dev into dev