issue #61 Implementation of Enh02.05 from IFA011ed421Signed-off-by: Preethika <preethika.p@tataelxsi.co.in>