Adds workaround for DATAREST-254