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