Pulled updates from TEvA4R.