Merge "Improve API query RevDel handling"