Merge remote-tracking branch 'upstream/staging'
factor out MANIFEST, SRCS, DOCS, IMPORTS and COPY