Merge "Fix bootchart"