Merge "Add references of missing components" into beijing