loading defect 6 for DEV-28143
Merge branch 'master' of https://github.com/PKSupport/OutOfMemory