Merge "Don't print contents of user-provided bundles." into pi-dev