Merge branch 'candidate' into demo
demo