merge master->edd(10.1.14_2)