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

ppreerequested to merge
issue#26 into dev-v3.5.1

Signed-off-by: Preethika preethika.p@tataelxsi.co.in

Merge request reports