Pin Point Color
Merge branch 'feature/Pin_Point_Color' into develop