[TW297] - More OVERRIDE/override changes and UpdateEntry changes in custom scripts.