initial commit for 3.3 branch

updates necessary with 3.3