Merge commit '26e8073e0ebc80177a64a9d3964995bbd3a0e240' into HEAD
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt