Merge branch '2386_LANG_case_insensitive' into 4.8.1-stable