Merge remote-tracking branch 'remotes/iwj/tags/for-upstream.depriv-2' into staging