Hi @OlgaDolinskaja ,Similar to @itmfru01, our organisation wants to perform as much custom code adaptations as possible while we are in ECC, so we can reduce our workload during the eventual S/4 upgrade.Any SAP note or guidance on this front?Thanks