Merge branch 'master-fd.o'