Merge "Don't stop current user's profile even if excess" into main