Sync with last changes in RESTAS.