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