Merge remote-tracking branch 'stefanha/trivial-patches' into staging