Merge branch 'master' into openaid-dev