Merge pull request #2208 from wpaulino/monitor-rebroadcast-pending-claims