Merge "Annotate state atoms" into rvc-dev