Copy changes in ticket 34