merge edd->master(10.1.14_2)