Merge "Replace ShadeRepository.shadeModel" into main