NEXUW-5927: Class left out from prev commit