Merge branch '1835_fix_logic_in_get_codepage_index'