[Process] Fix latest merge from 2.2 in 2.3
Merge branch '2.3'

* 2.3:
  [Process] Fix latest merge from 2.2 in 2.3