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