Merge "Add DCAE Bootstrap support"