Merge remote-tracking branch 'aneesh/for-upstream' into staging