Merge "[COMMON] Switch dgbuilder chart to new API"