Merge branch '2639_compile_disable_nls'