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