Trying dynamic include
Merge branch 'master' into dynamic-module-include
Changed api for charts
Merge branch 'master' into dynamic-module-include
Fixed dynamic include