watch dog to auto unlock delegate after delegate node restart
merge upstream master