Merge branch 'feature/4.1.x-translation' into feature/stabilization