issue#26 Fixes for IFA011ed341 based on 942 part1, part2 and part3

Signed-off-by: Preethika <preethika.p@tataelxsi.co.in>
1 job for issue#26 in 0 seconds (queued for 22 seconds)