Merge branch 'master' into open-check