Merge branch 'chart-service-cleanup'