Merge branch '2976_broken_magic_mode'