Merge "Add ShadePositionRepository" into main