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