I have no answer for you yet for number 1, but the idea with SDF is to move away from Bundles. On how to deprecate the old bundles with the SDF, I have no answer for you yet.