Merge "Clear the entries in updateState" into rvc-dev