Changes to incorporate changes from commit : 57e1fa32648a28ae83e3c3033258fe08de2e5fca which is for
" Improve l3-agent performance and prevent races in it."