Merge branch 'master' into Adding_oath_specs