Merge branch 'master' into stage
build public resources