Merge branch 'MDL-58852-choice-chart-options-multilang' of https://github.com/lucaboe...