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