[IMP] Remove journal and fix constraint

Merged Jose Luis Zanotti requested to merge T3183 into 15.0

Merge request reports