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