Applied Note2Core v3 changes.