Merge branch 'ff/rrdqueue'