changes to allocator as per review comments - 2
changes to allocator as per review comments - 2

SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn