Fixed DOC-1450
Merge branch '4.0.2'

* 4.0.2:
  Fixed DOC-1450