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