Bug fixes for SMA

Bug fixes for SMA
Merge branch 'master' of https://github.com/srinig29/MyRepository