Merge branch 'master' into forward-port