Follow up - RESTWS-408