[Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation