WED-6781

WED-6746
WED-6866