RESTWS-333
RESTWS-333