CDE-192: Bootstrap support