Merge "Ability for DPM to specify fallback mechanism"