Migrate MagicNumber + SONARCS-462