Merge branch 'evk1100-prep'