Merge "[incremental service] avoid nullptr dereferencing" into rvc-dev