Merge from HEAD, remove WITHOUT_PROFILE since we might need that for testing