cherry pick upstream (e.g. add two lines of comments :) )