Merge branch 'dev-list-charts' into dev-doc-table-optimization