Merge branch 'km/t1400-modernization'