Merge charts code

assigned to @benoit

created branch 23-merge-charts-code to address this issue

mentioned in merge request !15 (merged)

mentioned in commit 93fb581b

closed with merge request !15 (merged)