adding classed needed for fixing UES-130
Merge remote-tracking branch 'origin/master'