[FIX] RESTXQ: manual cherry-picks. Closes #932