merge edd->master(8.1.14)