Merge "Bootchart updates" into main