Uploaded code from 1.5.2 version.