TODO: Incremental rebuild issues are for 3.0