Merge "Don't update the same indication" into rvc-dev