Merge branch 'master' into sb/opt-filename