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