WAVE-16928
final changes
