Merge proposals dependent on lp://staging/~therp-nl/therp-backports/addons61-lp1075872-analytic_plan_fix_journal_reference

1. addons61-lp1075872-analytic_plan_fix_journal_reference
2. Dependent merge proposals