Merge "Default to slot 0 when no subs for testing" into pi-dev