Merge "Remove getCurrentUser call to find an alternative" into pi-dev