Merge "Fix a calling loop for getAllUsers." into pi-dev