Journal changes
Merge journal changes