merge edd->master(5.1.14)