Intel sync

This includes just Alejandro's DB commits