Merge branch 'ff/rrd-async'