Merge "Fix issue where guts would require bouncer" into pi-dev