Merge branch 'hotfix/translatable_fix'
Merge commit '289f5ff5b7ec13fb93ca8eea151110b1009fde74' into HEAD