Refactor activate() to use await
#2910
+561
−270
Open