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