Merge "Add back removed sub-charts"