Merge "Support multiple module annotations per atom" into rvc-dev