Merge "[elm_check]Refractoring based on review comments for internationalization...