Merge "Terminate SLAVE task before sending role change"