Merge remote-tracking branch 'vivier/tags/trivial-patches-pull-request' into staging