Merge "Follow best practices for Atomic variables" into rvc-dev