Merge "Fixed several bugs found for incidentd"