Merge remote-tracking branch 'afaerber-or/prep-up' into staging