Merge "Added support annotations for vendor atoms"