Update for Release 3.4 (merge with previous)