Merge "Optimize memory usage in incidentd" into rvc-dev