WED-6733

WED-6709
WED-6746