Fix issue 2247
Fix issue 2247

gkrishnan724/community-app,mbj36/community-app,gkrishnan724/community-app,openMF/community-app,mbj36/community-app,gkrishnan724/community-app,openMF/community-app,openMF/community-app,mbj36/community-app,gkrishnan724/community-app,mbj36/community-app,openMF/community-app