Cherrypicking a stable mvd package