Move subjournal fixes

Merged Uriel Mayo requested to merge moveSubjournalFixes into 15.0-stage

Merge request reports