Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging