Merge "Update diagram and developer guide for Si and P"