Sync with latest changes in RESTAS