Merge branch 'es/t1500-modernize'