Merge branch 'hotfix/translate' into develop
Merge branch 'hotfix/use-link-against-string' into develop
Refactor and change logic in product property effective values.
Merge branch 'feature/category-product-inheritance'