Merge branch 'master' into ff/rrdd