Merge branch 'rbd-poll'