Fixing build error
Fixing build error
Merge branch '2.5' into 2.6

* 2.5:
  Fixing build error
  Fixing build error
Merge branch '2.7'

* 2.7:
  Fixing build error
  Fixing build error