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