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