[Olena-patches] milena r1668: Update extract_character