Merge "Fix atom id annotation parsing" into rvc-dev