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