Merge "Check user type before adding user wakeup" into main