Update for rollup patch 1