Merge "Minimize the stopUser force parameter" into main