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