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