Prepared fo 4.0.2 version.
Merge branch 'develop'