Added custom translations for specific suffixes
Merge