merge opkg fix from r17611 to 8.09