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