Cherry pick b4f7, 94af, 996c, 4c12 and 95c5, attempt to move rollup out from server