WED-6866

WED-6781
ninja