Merge branch 'hotfix/use-link-against-string'
Merge branch 'feature/category-product-inheritance'
Fix translation issues in error messages
Merge branch 'hotfix/fix-translate-issues-in-exceptions' into develop