Merge "Fix PowerIncidentTest" into rvc-dev