[Process] Fix latest merge from 2.2 in 2.3