remove build annotation
Merge branch 'master' into new-build