added missing changes for 7.x-2.3