revet master to its original form when first forked
complete complete - Merge branch 'master' into manifest-empty-check