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