Update for 2.1.0 final packaging