Fix for bug 1450 high memory consumption

Change-Id: Ic95aa63bdd8713571826a7a7963f2d33ce80d325
Signed-off-by: palsus <subhankar.pal@aricent.com>
(cherry picked from commit e57f2f18fddd272c39d0086e94fa10eca5b86029)
3 files changed