Merge "Misc bouncer fixes" into pi-dev