Merge modified TechDay work into the correct branch