Merge pull request #2695 from vargaz/process-set-pending