Merge "Store annotation during collation" into rvc-dev