diff --git a/query_classifier/query_classifier.h b/query_classifier/query_classifier.h
index ccf08a6ea..b0ef64f3b 100644
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@@ -45,7 +45,7 @@ typedef enum {
     QUERY_TYPE_PREPARE_NAMED_STMT = 0x0400,  /*< Prepared stmt with name from user */
     QUERY_TYPE_PREPARE_STMT       = 0x0800,  /*< Prepared stmt with id provided by server */
     QUERY_TYPE_EXEC_STMT          = 0x1000,  /*< Execute prepared statement */
-    QUERY_TYPE_SESSION_READ       = 0x2000,   /*< Read session data (from master 31.8.14) */
+    QUERY_TYPE_SESSION_READ       = 0x2000,  /*< Read session data (from master 31.8.14) */
     QUERY_TYPE_CREATE_TMP_TABLE   = 0x4000,  /*< Create temporary table */
     QUERY_TYPE_READ_TMP_TABLE     = 0x8000   /*< Read temporary table */
 } skygw_query_type_t;
@@ -55,9 +55,9 @@ typedef struct parsing_info_st {
 #if defined(SS_DEBUG)
         skygw_chk_t pi_chk_top;     
 #endif
-        void*       pi_handle;                        /*< parsing info object pointer */
-        char*       pi_query_plain_str;               /*< query as plain string */
-        void     (*pi_done_fp)(void *);             /*< clean-up function for parsing info */
+        void*       pi_handle;		/*< parsing info object pointer */
+        char*       pi_query_plain_str;	/*< query as plain string */
+        void     (*pi_done_fp)(void *);	/*< clean-up function for parsing info */
 #if defined(SS_DEBUG)
         skygw_chk_t pi_chk_tail;
 #endif
diff --git a/server/MaxScale_template.cnf b/server/MaxScale_template.cnf
index 124fc923d..4b198dfb4 100644
--- a/server/MaxScale_template.cnf
+++ b/server/MaxScale_template.cnf
@@ -13,7 +13,7 @@ threads=1
 # Define a monitor that can be used to determine the state and role of
 # the servers.
 #
-# Valid options are:
+# Valid options for all monitors are:
 #
 # 	module=<name of module to load>
 # 	servers=<server name>,<server name>,...
@@ -29,6 +29,16 @@ module=mysqlmon
 servers=server1,server2,server3
 user=maxuser
 passwd=maxpwd
+# 
+# options for mysql_monitor only
+#
+# detect_replication_lag=<enable detection of replication slaves lag
+#			   via replication_heartbeat table,
+#			   default value is 0>
+# detect_stale_master=<if the replication is stopped or misconfigured
+#			   the previous detected master will be still available
+#			   until monitor or MaxSclale restart,
+#			   default value is 0>
 
 # A series of service definition
 #
diff --git a/server/core/config.c b/server/core/config.c
index 1a8689bfb..06eabd414 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -34,6 +34,7 @@
  * 29/05/14	Mark Riddoch		Addition of filter definition
  * 23/05/14	Massimiliano Pinto	Added automatic set of maxscale-id: first listening ipv4_raw + port + pid
  * 28/05/14	Massimiliano Pinto	Added detect_replication_lag parameter
+ * 28/08/14	Massimiliano Pinto	Added detect_stale_master parameter
  *
  * @endverbatim
  */
@@ -650,6 +651,7 @@ int			error_count = 0;
 			char *passwd;
 			unsigned long interval = 0;
 			int replication_heartbeat = 0;
+			int detect_stale_master = 0;
 
                         module = config_get_value(obj->parameters, "module");
 			servers = config_get_value(obj->parameters, "servers");
@@ -663,6 +665,10 @@ int			error_count = 0;
 				replication_heartbeat = atoi(config_get_value(obj->parameters, "detect_replication_lag"));
 			}
 
+			if (config_get_value(obj->parameters, "detect_stale_master")) {
+				detect_stale_master = atoi(config_get_value(obj->parameters, "detect_stale_master"));
+			}
+
                         if (module)
 			{
 				obj->element = monitor_alloc(obj->object, module);
@@ -686,6 +692,10 @@ int			error_count = 0;
 					if(replication_heartbeat == 1)
 						monitorSetReplicationHeartbeat(obj->element, replication_heartbeat);
 
+					/* detect stale master */
+					if(detect_stale_master == 1)
+						monitorDetectStaleMaster(obj->element, detect_stale_master);
+
 					/* get the servers to monitor */
 					s = strtok(servers, ",");
 					while (s)
@@ -1346,6 +1356,7 @@ static char *monitor_params[] =
                 "passwd",
 		"monitor_interval",
 		"detect_replication_lag",
+		"detect_stale_master",
                 NULL
         };
 /**
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 85ff878d7..6227afd5d 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -207,8 +207,7 @@ MONITOR	*ptr;
 /**
  * Show a single monitor
  *
- * @param dcb		DCB for printing output
- * @param monitor	The monitor to print information regarding
+ * @param dcb	DCB for printing output
  */
 void
 monitorShow(DCB *dcb, MONITOR *monitor)
@@ -304,12 +303,26 @@ monitorSetInterval (MONITOR *mon, unsigned long interval)
  * Enable Replication Heartbeat support in monitor.
  *
  * @param mon		The monitor instance
- * @param replication_heartbeat	The replication heartbeat
+ * @param enable	The enabling value is 1, 0 turns it off
  */
 void
-monitorSetReplicationHeartbeat(MONITOR *mon, int replication_heartbeat)
+monitorSetReplicationHeartbeat(MONITOR *mon, int enable)
 {
 	if (mon->module->replicationHeartbeat != NULL) {
-		mon->module->replicationHeartbeat(mon->handle, replication_heartbeat);
+		mon->module->replicationHeartbeat(mon->handle, enable);
+	}
+}
+
+/**
+ * Enable Stale Master assignement.
+ *
+ * @param mon		The monitor instance
+ * @param enable	The enabling value is 1, 0 turns it off
+ */
+void
+monitorDetectStaleMaster(MONITOR *mon, int enable)
+{
+	if (mon->module->detectStaleMaster != NULL) {
+		mon->module->detectStaleMaster(mon->handle, enable);
 	}
 }
diff --git a/server/core/poll.c b/server/core/poll.c
index 5e37c1cf5..9bd62c4df 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -100,7 +100,7 @@ poll_add_dcb(DCB *dcb)
 
         CHK_DCB(dcb);
         
-	ev.events = EPOLLIN | EPOLLOUT | EPOLLET;
+	ev.events = EPOLLIN | EPOLLOUT | EPOLLET | EPOLLHUP;
 	ev.data.ptr = dcb;
 
         /*<
@@ -480,7 +480,7 @@ poll_waitevents(void *arg)
 			} /*< for */
                         no_op = FALSE;
 		}
-        process_zombies:
+process_zombies:
 		zombies = dcb_process_zombies(thread_id);
                 
                 if (zombies == NULL) {
diff --git a/server/core/server.c b/server/core/server.c
index e0e2a41d3..631bb2010 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -30,6 +30,7 @@
  * 28/05/14	Massimiliano Pinto	Addition of rlagd and node_ts fields
  * 20/06/14	Massimiliano Pinto	Addition of master_id, depth, slaves fields
  * 26/06/14	Mark Riddoch		Addition of server parameters
+ * 30/08/14	Massimiliano Pinto	Addition of new service status description
  *
  * @endverbatim
  */
@@ -148,7 +149,8 @@ server_set_unique_name(SERVER *server, char *name)
  * Find an existing server using the unique section name in
  * configuration file
  *
- * @param	name	The Server name defined in the header file
+ * @param	servname	The Server name or address
+ * @param	port		The server port
  * @return	The server or NULL if not found
  */
 SERVER *
@@ -405,7 +407,7 @@ server_status(SERVER *server)
 {
 char	*status = NULL;
 
-	if ((status = (char *)malloc(200)) == NULL)
+	if ((status = (char *)malloc(256)) == NULL)
 		return NULL;
 	status[0] = 0;
 	if (server->status & SERVER_MAINT)
@@ -418,6 +420,10 @@ char	*status = NULL;
 		strcat(status, "Synced, ");
 	if (server->status & SERVER_NDB)
 		strcat(status, "NDB, ");
+	if (server->status & SERVER_SLAVE_OF_EXTERNAL_MASTER)
+		strcat(status, "Slave of External Server, ");
+	if (server->status & SERVER_STALE_STATUS)
+		strcat(status, "Stale Status, ");
 	if (server->status & SERVER_RUNNING)
 		strcat(status, "Running");
 	else
diff --git a/server/include/monitor.h b/server/include/monitor.h
index d65fd075f..5d018c16f 100644
--- a/server/include/monitor.h
+++ b/server/include/monitor.h
@@ -31,6 +31,8 @@
  * 25/07/13	Mark Riddoch		Addition of diagnotics
  * 23/05/14	Mark Riddoch		Addition of routine to find monitors by name
  * 23/05/14	Massimiliano Pinto	Addition of defaultId and setInterval
+ * 23/06/14	Massimiliano Pinto	Addition of replicationHeartbeat
+ * 28/08/14	Massimiliano Pinto	Addition of detectStaleMaster
  *
  * @endverbatim
  */
@@ -70,6 +72,7 @@ typedef struct {
 	void	(*setInterval)(void *, unsigned long);
 	void	(*defaultId)(void *, unsigned long);
 	void	(*replicationHeartbeat)(void *, int);
+	void	(*detectStaleMaster)(void *, int);
 } MONITOR_OBJECT;
 
 /**
@@ -110,4 +113,5 @@ extern void	monitorList(DCB *);
 extern void     monitorSetId(MONITOR *, unsigned long);
 extern void     monitorSetInterval (MONITOR *, unsigned long);
 extern void     monitorSetReplicationHeartbeat(MONITOR *, int);
+extern void     monitorDetectStaleMaster(MONITOR *, int);
 #endif
diff --git a/server/include/server.h b/server/include/server.h
index c558418bc..2b75ddf61 100644
--- a/server/include/server.h
+++ b/server/include/server.h
@@ -39,6 +39,7 @@
  * 20/06/14	Massimiliano Pinto	Addition of master_id, depth, slaves fields
  * 26/06/14	Mark Riddoch		Adidtion of server parameters
  * 30/07/14	Massimiliano Pinto	Addition of NDB status for MySQL Cluster
+ * 30/08/14	Massimiliano Pinto	Addition of SERVER_STALE_STATUS
  *
  * @endverbatim
  */
@@ -96,13 +97,14 @@ typedef struct server {
  *
  * These are a bitmap of attributes that may be applied to a server
  */
-#define	SERVER_RUNNING	0x0001			/**<< The server is up and running */
-#define SERVER_MASTER	0x0002			/**<< The server is a master, i.e. can handle writes */
-#define SERVER_SLAVE	0x0004			/**<< The server is a slave, i.e. can handle reads */
-#define SERVER_JOINED	0x0008			/**<< The server is joined in a Galera cluster */
-#define SERVER_NDB	0x0010			/**<< The server is part of a MySQL cluster setup */
-#define SERVER_MAINT	0x1000			/**<< Server is in maintenance mode */
-#define SERVER_SLAVE_OF_EXTERNAL_MASTER  0x0080	/**<< Server is slave of a Master outside the provided replication topology */
+#define	SERVER_RUNNING		0x0001	/**<< The server is up and running */
+#define SERVER_MASTER		0x0002	/**<< The server is a master, i.e. can handle writes */
+#define SERVER_SLAVE		0x0004	/**<< The server is a slave, i.e. can handle reads */
+#define SERVER_JOINED		0x0008	/**<< The server is joined in a Galera cluster */
+#define SERVER_NDB		0x0010	/**<< The server is part of a MySQL cluster setup */
+#define SERVER_MAINT		0x0020	/**<< Server is in maintenance mode */
+#define SERVER_SLAVE_OF_EXTERNAL_MASTER  0x0040	/**<< Server is slave of a Master outside the provided replication topology */
+#define SERVER_STALE_STATUS	0x0080	/**<< Server stale status, monitor didn't update it */
 
 /**
  * Is the server running - the macro returns true if the server is marked as running
diff --git a/server/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h
index c875a1232..cb2e41cd7 100644
--- a/server/modules/include/mysql_client_server_protocol.h
+++ b/server/modules/include/mysql_client_server_protocol.h
@@ -219,7 +219,7 @@ typedef enum mysql_server_cmd {
         MYSQL_COM_QUERY,
         MYSQL_COM_FIELD_LIST,
         MYSQL_COM_CREATE_DB, 
-        MYSQL_COM_DROP_DB, 
+        MYSQL_COM_DROP_DB,
         MYSQL_COM_REFRESH, 
         MYSQL_COM_SHUTDOWN, 
         MYSQL_COM_STATISTICS,
diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index 3cba61325..761078453 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -69,7 +69,7 @@ static	void	defaultUsers(void *, char *, char *);
 static	void	diagnostics(DCB *, void *);
 static  void    setInterval(void *, unsigned long);
 
-static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUsers, diagnostics, setInterval, NULL, NULL };
+static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUsers, diagnostics, setInterval, NULL, NULL, NULL };
 
 /**
  * Implementation of the mandatory version entry point
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index ee5b4eeb7..e78759f82 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -40,6 +40,9 @@
  *					the status to update in server status field before
  *					starting the replication consistency check.
  *					This will also give routers a consistent "status" of all servers
+ * 28/08/14	Massimiliano Pinto	Added detectStaleMaster feature: previous detected master will be used again, even if the replication is stopped.
+ *					This means both IO and SQL threads are not working on slaves.
+ *					This option is not enabled by default.
  *
  * @endverbatim
  */
@@ -62,7 +65,7 @@ extern int lm_enabled_logfiles_bitmask;
 
 static	void	monitorMain(void *);
 
-static char *version_str = "V1.2.0";
+static char *version_str = "V1.3.0";
 
 MODULE_INFO	info = {
 	MODULE_API_MONITOR,
@@ -80,6 +83,7 @@ static	void	diagnostics(DCB *, void *);
 static  void    setInterval(void *, unsigned long);
 static  void    defaultId(void *, unsigned long);
 static	void	replicationHeartbeat(void *, int);
+static	void	detectStaleMaster(void *, int);
 static  bool    mon_status_changed(MONITOR_SERVERS* mon_srv);
 static  bool    mon_print_fail_status(MONITOR_SERVERS* mon_srv);
 static	MONITOR_SERVERS   *getServerByNodeId(MONITOR_SERVERS *, long);
@@ -91,7 +95,7 @@ static int add_slave_to_master(long *, int, long);
 static void monitor_set_pending_status(MONITOR_SERVERS *, int);
 static void monitor_clear_pending_status(MONITOR_SERVERS *, int);
 
-static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUser, diagnostics, setInterval, defaultId, replicationHeartbeat };
+static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUser, diagnostics, setInterval, defaultId, replicationHeartbeat, detectStaleMaster };
 
 /**
  * Implementation of the mandatory version entry point
@@ -160,6 +164,7 @@ MYSQL_MONITOR *handle;
             handle->id = MONITOR_DEFAULT_ID;
             handle->interval = MONITOR_INTERVAL;
             handle->replicationHeartbeat = 0;
+            handle->detectStaleMaster = 0;
             handle->master = NULL;
             spinlock_init(&handle->lock);
         }
@@ -306,6 +311,7 @@ char		*sep;
 	dcb_printf(dcb,"\tSampling interval:\t%lu milliseconds\n", handle->interval);
 	dcb_printf(dcb,"\tMaxScale MonitorId:\t%lu\n", handle->id);
 	dcb_printf(dcb,"\tReplication lag:\t%s\n", (handle->replicationHeartbeat == 1) ? "enabled" : "disabled");
+	dcb_printf(dcb,"\tDetect Stale Master:\t%s\n", (handle->detectStaleMaster == 1) ? "enabled" : "disabled");
 	dcb_printf(dcb, "\tMonitored servers:	");
 
 	db = handle->databases;
@@ -403,6 +409,12 @@ char 		  *server_string;
 			monitor_clear_pending_status(database, SERVER_SLAVE);
 			monitor_clear_pending_status(database, SERVER_MASTER);
 
+			/* Clean addition status too */
+			server_clear_status(database->server, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+			server_clear_status(database->server, SERVER_STALE_STATUS);
+			monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+			monitor_clear_pending_status(database, SERVER_STALE_STATUS);
+
 			return;
 		}
 		free(dpwd);
@@ -458,12 +470,20 @@ char 		  *server_string;
 				if (strncmp(row[12], "Yes", 3) == 0
 						&& strncmp(row[13], "Yes", 3) == 0) {
 					isslave += 1;
-					
+				}
+
+				/* If Slave_IO_Running = Yes, assign the master_id to current server: this allows building 
+				 * the replication tree, slaves ids will be added to master(s) and we will have at least the 
+				 * root master server.
+				 * Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
+				 */
+				if (strncmp(row[12], "Yes", 3) == 0) {
 					/* get Master_Server_Id values */
                                         master_id = atol(row[41]);
                                         if (master_id == 0)
                                                 master_id = -1;
 				}
+
 				i++;
 			}
 			/* store master_id of current node */
@@ -489,7 +509,14 @@ char 		  *server_string;
 				if (strncmp(row[10], "Yes", 3) == 0
 						&& strncmp(row[11], "Yes", 3) == 0) {
 					isslave = 1;
+				}
 
+				/* If Slave_IO_Running = Yes, assign the master_id to current server: this allows building 
+				 * the replication tree, slaves ids will be added to master(s) and we will have at least the 
+				 * root master server.
+				 * Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
+				 */
+				if (strncmp(row[10], "Yes", 3) == 0) {
 					/* get Master_Server_Id values */
 					master_id = atol(row[39]);
 					if (master_id == 0)
@@ -505,6 +532,7 @@ char 		  *server_string;
 
 	/* Remove addition info */
 	monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+	monitor_clear_pending_status(database, SERVER_STALE_STATUS);
 
 	/* Please note, the MASTER status and SERVER_SLAVE_OF_EXTERNAL_MASTER
 	 * will be assigned in the monitorMain() via get_replication_tree() routine
@@ -534,6 +562,7 @@ monitorMain(void *arg)
 MYSQL_MONITOR	*handle = (MYSQL_MONITOR *)arg;
 MONITOR_SERVERS	*ptr;
 int replication_heartbeat = handle->replicationHeartbeat;
+int detect_stale_master = handle->detectStaleMaster;
 int num_servers=0;
 MONITOR_SERVERS *root_master;
 
@@ -545,6 +574,7 @@ MONITOR_SERVERS *root_master;
                                    "module. Exiting.\n")));
 		return;
 	}                         
+
 	handle->status = MONITOR_RUNNING;
 	while (1)
 	{
@@ -616,10 +646,19 @@ MONITOR_SERVERS *root_master;
 		while (ptr)
 		{
 			if (! SERVER_IN_MAINT(ptr->server)) {
-                        	ptr->server->status = ptr->pending_status;
+				/* If "detect_stale_master" option is On, let's use the previus master */
+				if (detect_stale_master && root_master && (!strcmp(ptr->server->name, root_master->server->name) && ptr->server->port == root_master->server->port) && (ptr->server->status & SERVER_MASTER) && !(ptr->pending_status & SERVER_MASTER)) {
+					/* in this case server->status will not be updated from pending_status */
+					LOGIF(LM, (skygw_log_write_flush(
+						LOGFILE_MESSAGE, "[mysql_mon]: root server [%s:%i] is no longer Master, let's use it again even if it could be a stale master, you have been warned!", ptr->server->name, ptr->server->port)));
+					/* Set the STALE bit for this server in server struct */
+					server_set_status(ptr->server, SERVER_STALE_STATUS);
+				} else {
+					ptr->server->status = ptr->pending_status;
+				}
 			}
-                        ptr = ptr->next;
-                }
+			ptr = ptr->next;
+		}
 
 		/* Do now the heartbeat replication set/get for MySQL Replication Consistency */
 		if (replication_heartbeat && root_master && (SERVER_IS_MASTER(root_master->server) || SERVER_IS_RELAY_SERVER(root_master->server))) {
@@ -665,19 +704,34 @@ setInterval(void *arg, unsigned long interval)
 {
 MYSQL_MONITOR   *handle = (MYSQL_MONITOR *)arg;
 	memcpy(&handle->interval, &interval, sizeof(unsigned long));
-	}
+}
 
 /**
  * Enable/Disable the MySQL Replication hearbeat, detecting slave lag behind master.
  *
- * @param arg           The handle allocated by startMonitor
- * @param replicationHeartbeat  To enable it 1, disable it with 0
+ * @param arg		The handle allocated by startMonitor
+ * @param enable	To enable it 1, disable it with 0
  */
 static void
-replicationHeartbeat(void *arg, int replicationHeartbeat)
+replicationHeartbeat(void *arg, int enable)
 {
 MYSQL_MONITOR   *handle = (MYSQL_MONITOR *)arg;
-	memcpy(&handle->replicationHeartbeat, &replicationHeartbeat, sizeof(int));
+	memcpy(&handle->replicationHeartbeat, &enable, sizeof(int));
+}
+
+/**
+ * Enable/Disable the MySQL Replication Stale Master dectection, allowing a previouvsly detected master to still act as a Master.
+ * This option must be enabled in order to keep the Master when the replication is stopped or removed from slaves.
+ * If the replication is still stopped when MaxSclale is restarted no Master will be available.
+ *
+ * @param arg		The handle allocated by startMonitor
+ * @param enable	To enable it 1, disable it with 0
+ */
+static void
+detectStaleMaster(void *arg, int enable)
+{
+MYSQL_MONITOR   *handle = (MYSQL_MONITOR *)arg;
+	memcpy(&handle->detectStaleMaster, &enable, sizeof(int));
 }
 
 static bool mon_status_changed(
@@ -1038,6 +1092,10 @@ static MONITOR_SERVERS *get_replication_tree(MYSQL_MONITOR *handle, int num_serv
 					monitor_set_pending_status(master, SERVER_MASTER);
 				} else {
 					if (current->master_id > 0) {
+						/* this server is slave of another server not in MaxScale configuration
+						 * we cannot use it as a real slave.
+						 */
+						monitor_clear_pending_status(ptr, SERVER_SLAVE);
 						monitor_set_pending_status(ptr, SERVER_SLAVE_OF_EXTERNAL_MASTER);
 					}
 				}
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index 0e06db6e4..eb2d37bcd 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -32,6 +32,7 @@
  * 26/05/14	Massimiliano	Pinto	Default values for MONITOR_INTERVAL
  * 28/05/14	Massimiliano	Pinto	Addition of new fields in MYSQL_MONITOR struct
  * 24/06/14	Massimiliano	Pinto	Addition of master field in MYSQL_MONITOR struct and MONITOR_MAX_NUM_SLAVES
+ * 28/08/14	Massimiliano	Pinto	Addition of detectStaleMaster
  *
  * @endverbatim
  */
@@ -43,9 +44,9 @@
 typedef struct monitor_servers {
 	SERVER		*server;	/**< The server being monitored */
 	MYSQL		*con;		/**< The MySQL connection */
-	int             mon_err_count;
-        unsigned int    mon_prev_status;
-	unsigned int    pending_status; /**< Pending Status flag bitmap */	
+	int		mon_err_count;
+	unsigned int	mon_prev_status;
+	unsigned int	pending_status; /**< Pending Status flag bitmap */	
 	struct monitor_servers
 			*next;		/**< The next server in the list */
 } MONITOR_SERVERS;
@@ -54,17 +55,18 @@ typedef struct monitor_servers {
  * The handle for an instance of a MySQL Monitor module
  */
 typedef struct {
-        SPINLOCK  lock;	                /**< The monitor spinlock */
-        pthread_t tid;                  /**< id of monitor thread */ 
-        int       shutdown;             /**< Flag to shutdown the monitor thread */
-        int       status;               /**< Monitor status */
-        char      *defaultUser;         /**< Default username for monitoring */
-        char      *defaultPasswd;       /**< Default password for monitoring */
-        unsigned long   interval;       /**< Monitor sampling interval */
-        unsigned long         id;       /**< Monitor ID */
+	SPINLOCK  lock;			/**< The monitor spinlock */
+	pthread_t tid;			/**< id of monitor thread */ 
+	int    	  shutdown;		/**< Flag to shutdown the monitor thread */
+	int       status;		/**< Monitor status */
+	char      *defaultUser;		/**< Default username for monitoring */
+	char      *defaultPasswd;	/**< Default password for monitoring */
+	unsigned long   interval;	/**< Monitor sampling interval */
+	unsigned long         id;	/**< Monitor ID */
 	int	replicationHeartbeat;	/**< Monitor flag for MySQL replication heartbeat */
-        MONITOR_SERVERS *master;        /**< Master server for MySQL Master/Slave replication */
-        MONITOR_SERVERS	*databases;     /**< Linked list of servers to monitor */
+	int	detectStaleMaster;	/**< Monitor flag for MySQL replication Stale Master detection */
+	MONITOR_SERVERS *master;	/**< Master server for MySQL Master/Slave replication */
+	MONITOR_SERVERS	*databases;     /**< Linked list of servers to monitor */
 } MYSQL_MONITOR;
 
 #define MONITOR_RUNNING		1
diff --git a/server/modules/monitor/ndbcluster_mon.c b/server/modules/monitor/ndbcluster_mon.c
index 12cc181e3..c565c4002 100644
--- a/server/modules/monitor/ndbcluster_mon.c
+++ b/server/modules/monitor/ndbcluster_mon.c
@@ -63,7 +63,7 @@ static	void	defaultUsers(void *, char *, char *);
 static	void	diagnostics(DCB *, void *);
 static  void    setInterval(void *, unsigned long);
 
-static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUsers, diagnostics, setInterval, NULL, NULL };
+static MONITOR_OBJECT MyObject = { startMonitor, stopMonitor, registerServer, unregisterServer, defaultUsers, diagnostics, setInterval, NULL, NULL, NULL };
 
 /**
  * Implementation of the mandatory version entry point
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 00bcf0b59..76ec40a60 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -1407,10 +1407,10 @@ static int routeQuery(
 		}
 	}
         /**
-         * If autocommit is disabled or transaction is explicitly started
-         * transaction becomes active and master gets all statements until
-         * transaction is committed and autocommit is enabled again.
-         */
+          * If autocommit is disabled or transaction is explicitly started
+          * transaction becomes active and master gets all statements until
+          * transaction is committed and autocommit is enabled again.
+          */
         if (router_cli_ses->rses_autocommit_enabled &&
                 QUERY_IS_TYPE(qtype, QUERY_TYPE_DISABLE_AUTOCOMMIT))
         {
@@ -1470,16 +1470,16 @@ static int routeQuery(
 		{
 			hkey = NULL;
 		}
-		
+
 		if(rses_prop_tmp == NULL)
 		{
 			if((rses_prop_tmp = 
 				(rses_property_t*)calloc(1,sizeof(rses_property_t))))
 			{
-				#if defined(SS_DEBUG)
+#if defined(SS_DEBUG)
 				rses_prop_tmp->rses_prop_chk_top = CHK_NUM_ROUTER_PROPERTY;
 				rses_prop_tmp->rses_prop_chk_tail = CHK_NUM_ROUTER_PROPERTY;
-				#endif
+#endif
 				rses_prop_tmp->rses_prop_rsession = router_cli_ses;
 				rses_prop_tmp->rses_prop_refcount = 1;
 				rses_prop_tmp->rses_prop_next = NULL;
@@ -1525,7 +1525,7 @@ static int routeQuery(
 #endif
 		free(hkey);
 	}
-	
+
 	/** Check if DROP TABLE... targets a temporary table */
 	if (is_drop_table_query(querybuf))
 	{