#10: migrate CDI settings