Merge branch 'master' into fd-forward