Merge "Don't return from loop" into pi-dev