Merge remote-tracking branch 'remotes/kvaneesh/tags/for-upstream-signed' into staging