Fix key name
Merge branch 'charts' into develop