Fix cleanup issue
Merge pull request #955 from xschildw/release-25

Fix cleanup issue
Fix compile
Merge pull request #956 from xschildw/release-25

Fix compile
Merge branch 'release-25' into develop