Ticket #3505 Added checks for MS_SLAVE and MS_REC