Fix build error
Merge branch '2.3' into 2.5
Merge branch '2.5'