Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X

# Conflicts:
#	server/database.js

server/server.js

@@ -1728,6 +1728,7 @@ async function pauseMonitor(userID, monitorID) {
 
     if (monitorID in server.monitorList) {
         server.monitorList[monitorID].stop();
+        server.monitorList[monitorID].active = 0;
     }
 }