merged upstream net changes