Upstream notes

From raju