TK commit Defect_07
Merge branch 'master' of https://github.com/PKSupport/OutOfMemory