Merge "Enable fallback languages when retrieving messages"