Merge branch 'master' into xcircuit-3.10