Merge "Fix an accidentally reverted condition" into pi-dev