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