Merge "Add resource reference annotations"