Merge "Removing users synchronously" into main