Fixed a memory leak
Merge branch 'patch/disk_solaris' into release/5.2.2