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