Merge "dequeue abandoned changes"