Update 3.5 (include changes from Upd2)