WED-6746

WED-6733
WED-6781