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