Merge of MagicVersionChanger remnants