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